# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/05/24 13:47:57-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# arch/i386/kernel/setup.c
#   2004/05/24 13:47:56-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/05/24 13:47:55-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/24 13:46:19-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/linux-2.4
#   into hp.com:/home/helgaas/linux/ia64-extras
# 
# arch/i386/kernel/setup.c
#   2004/05/24 13:46:18-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/05/24 13:46:18-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#